From 4c7cafdba809d3f7a7fd4640ab58f688da2fd28b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 5 May 2020 16:48:23 -0400 Subject: [PATCH] label: Use dispose instead of destroy The destroy vfunc is going away. --- gtk/gtklabel.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 5c101868ab..37d7064734 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -418,7 +418,7 @@ static void gtk_label_get_property (GObject *object, GValue *value, GParamSpec *pspec); static void gtk_label_finalize (GObject *object); -static void gtk_label_destroy (GtkWidget *widget); +static void gtk_label_dispose (GObject *object); static void gtk_label_size_allocate (GtkWidget *widget, int width, int height, @@ -609,8 +609,8 @@ gtk_label_class_init (GtkLabelClass *class) gobject_class->set_property = gtk_label_set_property; gobject_class->get_property = gtk_label_get_property; gobject_class->finalize = gtk_label_finalize; + gobject_class->dispose = gtk_label_dispose; - widget_class->destroy = gtk_label_destroy; widget_class->size_allocate = gtk_label_size_allocate; widget_class->state_flags_changed = gtk_label_state_flags_changed; widget_class->css_changed = gtk_label_css_changed; @@ -2734,13 +2734,13 @@ gtk_label_get_wrap_mode (GtkLabel *self) } static void -gtk_label_destroy (GtkWidget *widget) +gtk_label_dispose (GObject *object) { - GtkLabel *self = GTK_LABEL (widget); + GtkLabel *self = GTK_LABEL (object); gtk_label_set_mnemonic_widget (self, NULL); - GTK_WIDGET_CLASS (gtk_label_parent_class)->destroy (widget); + G_OBJECT_CLASS (gtk_label_parent_class)->dispose (object); } static void -- 2.30.2